Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #15414 upstream release 1.1 #18187

Conversation

thockin
Copy link
Member

@thockin thockin commented Dec 4, 2015

This PR never got cherrypicked for 1.1

@zmerlynn

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

Ugh. I can easily add the beta annotation in kube-proxy, but the Ingress one is dicier after we've shipped, isn't it?

@thockin
Copy link
Member Author

thockin commented Dec 4, 2015

oh yeah, let me pull that commit out

On Thu, Dec 3, 2015 at 5:10 PM, Zach Loafman notifications@github.com
wrote:

Ugh. I can easily add the beta annotation in kube-proxy, but the Ingress
one is dicier after we've shipped, isn't it?


Reply to this email directly or view it on GitHub
#18187 (comment)
.

@thockin
Copy link
Member Author

thockin commented Dec 4, 2015

Ugh, now that it is out, I should roll it back in head, I guess.

On Thu, Dec 3, 2015 at 5:15 PM, Tim Hockin thockin@google.com wrote:

oh yeah, let me pull that commit out

On Thu, Dec 3, 2015 at 5:10 PM, Zach Loafman notifications@github.com
wrote:

Ugh. I can easily add the beta annotation in kube-proxy, but the Ingress
one is dicier after we've shipped, isn't it?


Reply to this email directly or view it on GitHub
#18187 (comment)
.

@thockin thockin force-pushed the automated-cherry-pick-of-#15414-upstream-release-1.1 branch from 21c696f to d42d874 Compare December 4, 2015 01:17
@thockin
Copy link
Member Author

thockin commented Dec 4, 2015

OK, this is 2 of the 3 commits in the original PR

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

I like it. LGTM.

@zmerlynn zmerlynn added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 4, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 4, 2015
@zmerlynn zmerlynn assigned zmerlynn and unassigned mikedanese Dec 4, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 4, 2015

GCE e2e build/test failed for commit 21c696f80928551e9016ba8cf31b3ceafc421e7f.

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

@k8s-bot test this

@k8s-bot
Copy link

k8s-bot commented Dec 4, 2015

GCE e2e build/test failed for commit d42d874.

@k8s-bot
Copy link

k8s-bot commented Dec 4, 2015

GCE e2e build/test failed for commit d42d874.

@thockin
Copy link
Member Author

thockin commented Dec 4, 2015

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Dec 4, 2015

GCE e2e test build/test passed for commit d42d874.

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

@k8s-bot unit test this

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

Green! Merging.

zmerlynn added a commit that referenced this pull request Dec 4, 2015
…4-upstream-release-1.1

Automated cherry pick of #15414 upstream release 1.1
@zmerlynn zmerlynn merged commit 0e4e473 into kubernetes:release-1.1 Dec 4, 2015
@ikehz ikehz added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Dec 8, 2015
@thockin thockin deleted the automated-cherry-pick-of-#15414-upstream-release-1.1 branch December 14, 2015 16:51
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…k-of-#15414-upstream-release-1.1

Automated cherry pick of kubernetes#15414 upstream release 1.1
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…k-of-#15414-upstream-release-1.1

Automated cherry pick of kubernetes#15414 upstream release 1.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants